Merged.
authoremellor@leeni.uk.xensource.com <emellor@leeni.uk.xensource.com>
Sun, 27 Nov 2005 01:06:44 +0000 (01:06 +0000)
committeremellor@leeni.uk.xensource.com <emellor@leeni.uk.xensource.com>
Sun, 27 Nov 2005 01:06:44 +0000 (01:06 +0000)

Trivial merge